Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Wed, 20 Jan 2010 06:28:33 +0000 (07:28 +0100)
committerJan D. <jan.h.d@swipnet.se>
Wed, 20 Jan 2010 06:28:33 +0000 (07:28 +0100)

Trivial merge